From 04b086824258a42fda5ac6df6ec57ec1c852a48d Mon Sep 17 00:00:00 2001 From: Ilias Tsitsimpis Date: Sat, 24 Jan 2026 14:41:42 +0200 Subject: [PATCH] Allow setting path for LLC/OPT during configuration Patch configure.ac to allow us to modify the path for LLC/OPT during configuration. Gbp-Pq: Name allow-setting-llvm-program --- configure.ac | 12 +++++++++--- distrib/configure.ac.in | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 50271211..0942a406 100644 --- a/configure.ac +++ b/configure.ac @@ -523,21 +523,27 @@ AC_SUBST([ConfiguredEmsdkVersion]) dnl ** Which LLVM llc to use? dnl -------------------------------------------------------------- AC_ARG_VAR(LLC,[Use as the path to LLVM's llc [default=autodetect]]) -FIND_LLVM_PROG([LLC], [llc], [$LlvmMinVersion], [$LlvmMaxVersion]) +if test -z "$LLC"; then + FIND_LLVM_PROG([LLC], [llc], [$LlvmMinVersion], [$LlvmMaxVersion]) +fi LlcCmd="$LLC" AC_SUBST([LlcCmd]) dnl ** Which LLVM opt to use? dnl -------------------------------------------------------------- AC_ARG_VAR(OPT,[Use as the path to LLVM's opt [default=autodetect]]) -FIND_LLVM_PROG([OPT], [opt], [$LlvmMinVersion], [$LlvmMaxVersion]) +if test -z "$OPT"; then + FIND_LLVM_PROG([OPT], [opt], [$LlvmMinVersion], [$LlvmMaxVersion]) +fi OptCmd="$OPT" AC_SUBST([OptCmd]) dnl ** Which LLVM assembler to use? dnl -------------------------------------------------------------- AC_ARG_VAR(LLVMAS,[Use as the path to LLVM's assembler (typically clang) [default=autodetect]]) -FIND_LLVM_PROG([LLVMAS], [clang], [$LlvmMinVersion], [$LlvmMaxVersion]) +if test -z "$LLVMAS"; then + FIND_LLVM_PROG([LLVMAS], [clang], [$LlvmMinVersion], [$LlvmMaxVersion]) +fi LlvmAsCmd="$LLVMAS" AC_SUBST([LlvmAsCmd]) diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in index f7a4bcc9..13fa8129 100644 --- a/distrib/configure.ac.in +++ b/distrib/configure.ac.in @@ -184,21 +184,27 @@ LlvmMaxVersion=@LlvmMaxVersion@ dnl ** Which LLVM llc to use? dnl -------------------------------------------------------------- AC_ARG_VAR(LLC,[Use as the path to LLVM's llc [default=autodetect]]) -FIND_LLVM_PROG([LLC], [llc], [$LlvmMinVersion], [$LlvmMaxVersion]) +if test -z "$LLC"; then + FIND_LLVM_PROG([LLC], [llc], [$LlvmMinVersion], [$LlvmMaxVersion]) +fi LlcCmd="$LLC" AC_SUBST([LlcCmd]) dnl ** Which LLVM opt to use? dnl -------------------------------------------------------------- AC_ARG_VAR(OPT,[Use as the path to LLVM's opt [default=autodetect]]) -FIND_LLVM_PROG([OPT], [opt], [$LlvmMinVersion], [$LlvmMaxVersion]) +if test -z "$OPT"; then + FIND_LLVM_PROG([OPT], [opt], [$LlvmMinVersion], [$LlvmMaxVersion]) +fi OptCmd="$OPT" AC_SUBST([OptCmd]) dnl ** Which LLVM assembler to use? dnl -------------------------------------------------------------- AC_ARG_VAR(LLVMAS,[Use as the path to LLVM's assembler (typically clang) [default=autodetect]]) -FIND_LLVM_PROG([LLVMAS], [clang], [$LlvmMinVersion], [$LlvmMaxVersion]) +if test -z "$LLVMAS"; then + FIND_LLVM_PROG([LLVMAS], [clang], [$LlvmMinVersion], [$LlvmMaxVersion]) +fi LlvmAsCmd="$LLVMAS" AC_SUBST([LlvmAsCmd]) -- 2.30.2